Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 19 Aug 2005 10:50:15 +0000 (10:50 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 19 Aug 2005 10:50:15 +0000 (10:50 +0000)
commit4ba5dde55390366f57e6126256e4510b635480c8
tree47d9cb20bcc4fdb647ec6e3a4804e3983f2a3c24
parent53e090236c05d14b9462cfe15ccd8e94fe70021b
parent6453dfe51cd944d625613a95ad9ec676f86a461c
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
xen/arch/x86/mm.c